From 42cb64c2f675856f0b8da0370acd249e3513bfe5 Mon Sep 17 00:00:00 2001 From: Claudio Saavedra Date: Mon, 12 Jan 2009 09:57:01 +0000 Subject: [PATCH] =?utf8?q?Bug=20567468=20=E2=80=93=20no=20check=20for=20tr?= =?utf8?q?ailing=20!=3D=20NULL=20in?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 2009-01-12 Claudio Saavedra Bug 567468 – no check for trailing != NULL in gtk_text_layout_get_iter_at_position() * gtk/gtktextlayout.c: (gtk_text_layout_get_iter_at_position): Check for trailing to be non-NULL. * gtk/gtktextview.c: (gtk_text_view_get_iter_at_position): document that trailing may be NULL. svn path=/trunk/; revision=22090 --- ChangeLog | 10 ++++++++++ gtk/gtktextlayout.c | 3 ++- gtk/gtktextview.c | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 94e85c926b..3f282b1d87 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2009-01-12 Claudio Saavedra + + Bug 567468 – no check for trailing != NULL in + gtk_text_layout_get_iter_at_position() + + * gtk/gtktextlayout.c: (gtk_text_layout_get_iter_at_position): + Check for trailing to be non-NULL. + * gtk/gtktextview.c: (gtk_text_view_get_iter_at_position): document + that trailing may be NULL. + 2009-01-11 Tor Lillqvist Bug 523554 - Copy from GIMP to Word broken diff --git a/gtk/gtktextlayout.c b/gtk/gtktextlayout.c index 8d4cddc438..156503a506 100644 --- a/gtk/gtktextlayout.c +++ b/gtk/gtktextlayout.c @@ -2654,7 +2654,8 @@ void gtk_text_layout_get_iter_at_position (GtkTextLayout *layout, if (y > display->height - display->top_margin - display->bottom_margin) { byte_index = _gtk_text_line_byte_count (line); - *trailing = 0; + if (trailing) + *trailing = 0; } else { diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c index 0c10a4d260..1ec7b0248c 100644 --- a/gtk/gtktextview.c +++ b/gtk/gtktextview.c @@ -1509,7 +1509,7 @@ gtk_text_view_get_iter_at_location (GtkTextView *text_view, * gtk_text_view_get_iter_at_position: * @text_view: a #GtkTextView * @iter: a #GtkTextIter - * @trailing: location to store an integer indicating where + * @trailing: if non-%NULL, location to store an integer indicating where * in the grapheme the user clicked. It will either be * zero, or the number of characters in the grapheme. * 0 represents the trailing edge of the grapheme. -- 2.30.2